Merge from trunk
authorDavid Engster <dengste@eml.cc>
Sat, 27 Jul 2013 21:04:38 +0000 (23:04 +0200)
committerDavid Engster <dengste@eml.cc>
Sat, 27 Jul 2013 21:04:38 +0000 (23:04 +0200)
commit36afb525dcad7a3a881e77cd5aa11283a09119d3
treed79e44d493d48eb01784647729f759c24a3de708
parent5419570162f7f20f08259adea0765e3f31c1de2e
parent851176a6cda8c6c902bea8d517cfa38bfcb41cdc
Merge from trunk